Commit graph

19 commits

Author SHA1 Message Date
Botanic
8eeb5d19ba Merge 2013-10-26 00:50:56 -07:00
Matthew Lagoe
124e16fb6a Merged in botanic/rc-botanic-webdev (pull request #39)
additional fix's for AMS
2013-10-25 22:59:57 -07:00
Matthew Lagoe
a95fd69712 Merged in rc-botanic-webdev (pull request #1)
additional fix's for AMS
2013-10-25 22:55:31 -07:00
Matthew Lagoe
df3da6f99b Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #37)
Fix's for installer for AMS
2013-10-24 20:27:37 -07:00
Matthew Lagoe
3a917562ff Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #36)
fixed php warnings and errors
2013-10-24 04:45:56 -07:00
Matthew Lagoe
84d5e2d0bd Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #35)
fixed groups etc
2013-10-24 02:25:28 -07:00
Matthew Lagoe
6f97c0ade9 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #34)
fixed some more static non-static warnings
2013-10-23 18:28:43 -07:00
Matthew Lagoe
9a6f3ba85d Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #33)
fixed php warnings and errors
2013-10-23 18:08:15 -07:00
Matthew Lagoe
85ea923269 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #32)
added fork on linux as well as implimented pid file to check for other running crons
2013-10-23 15:40:57 -07:00
Matthew Lagoe
b1642a8e77 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #31)
Implimented lazy cron and fixed syncronize button.
2013-10-23 15:08:21 -07:00
Matthew Lagoe
09c4314a05 Merged in botanic/rc-botanic-webdev/rc-botanic-webdev (pull request #30)
removed 7z and made setup page for AMS
2013-10-23 13:39:58 -07:00
Botanic
e5619e273b Backed out changeset: 97505c669e04 2013-02-08 03:09:17 -08:00
Botanic
3d2b747e6d Backed out changeset: e36d69e04aa1 2013-02-08 03:08:59 -08:00
Botanic
341e468d5b Backed out changeset: 57d8f3733daf 2013-02-08 03:08:42 -08:00
Botanic
bc638755e6 Backed out changeset: c569b6062f5d 2013-02-08 03:08:24 -08:00
Botanic
84701dfca3 fixed load form and character_cl 2013-02-07 15:04:28 -08:00
Botanic
326b07885f fixed vertex_program_parse 2013-02-07 13:00:51 -08:00
Botanic
2521f746d1 Fixed warning: multi-character character constant [-Wmultichar] 2013-02-07 12:19:00 -08:00
Botanic
ab608d2cfe Fixed warning "unix_event_emitter.cpp:569:8: warning: 'KeySym XKeycodeToKeysym(Display*, KeyCode, int)' is deprecated (declared at /usr/include/X11/Xlib.h:1695)" 2013-02-07 03:27:12 -08:00