Brice Maron
|
4753cc3ebd
|
Merge branch 'master' into multi_app_dir
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
|
2012-06-14 21:16:59 +00:00 |
Bart Visscher
|
4260dce826
|
Better handling of core.css and core.js
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
|
2012-06-07 21:35:40 +02:00 |
|
Brice Maron
|
5c2b2fc842
|
Change app path logic in templates
|
2012-06-06 20:24:16 +00:00 |
|
Bart Visscher
|
4a5973662c
|
Merge branch 'unstable'
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
|
2012-06-04 23:02:05 +02:00 |
|
Bart Visscher
|
ce1e4425c2
|
Combine and minimize core and default app js files
|
2012-05-16 18:53:46 +02:00 |
|
Bart Visscher
|
f71fec8cdc
|
Combine and minimize core and default app css files
|
2012-05-16 18:53:46 +02:00 |
|
Bart Visscher
|
20499e336b
|
Remove duplicate line
|
2012-05-11 22:13:05 +02:00 |
Georg Ehrke
|
c536e930f4
|
add appswebroot to the guest template
|
2012-05-02 16:41:23 +02:00 |
|
Georg Ehrke
|
ebcaa46482
|
fix loading of css files that are core related
|
2012-04-26 15:19:27 +02:00 |
Jan-Christoph Borchardt
|
70d0103a67
|
updated logos and icons
|
2012-04-16 11:34:16 +02:00 |
|
Jan-Christoph Borchardt
|
71caa4a20c
|
added code and license links next to version number
|
2011-10-08 10:10:29 +02:00 |
Jan-Christoph Borchardt
|
8d14c489eb
|
changed short description and styled unobtrusively
|
2011-09-28 17:14:37 +02:00 |
Bart Visscher
|
82c7598861
|
Remove global vars and use the OC static version.
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
|
2011-09-18 19:37:54 +02:00 |
|
Jan-Christoph Borchardt
|
a47f22a275
|
clarified what we do
|
2011-09-04 16:38:45 +02:00 |
|
Jan-Christoph Borchardt
|
0db5c734bc
|
some header fixes
|
2011-08-19 22:53:07 +02:00 |
|
Jan-Christoph Borchardt
|
4a52886728
|
updated why we do this
|
2011-08-15 17:02:26 +02:00 |
|
Jan-Christoph Borchardt
|
b2768637d2
|
updated translations
|
2011-08-13 05:13:35 +02:00 |
|
Jan-Christoph Borchardt
|
44f3dfe771
|
added semantic meaning with header, nav and footer
|
2011-08-09 10:30:37 +02:00 |
|
Jan-Christoph Borchardt
|
c350301342
|
optimized CSS, fixed login header
|
2011-08-08 19:50:42 +02:00 |
Frank Karlitschek
|
1dc3cb67fa
|
more improved error reporting
|
2011-08-06 23:31:38 +02:00 |
Robin Appelman
|
4d11e920be
|
provide an option to add custom elements to the header of templates
|
2011-06-24 18:02:19 +02:00 |
Jakob Sack
|
91c37bbb76
|
moved core stuff to /core
|
2011-06-20 20:29:30 +02:00 |