3b547895ec
Merge pull request #1306 from owncloud/smart-app-banner
...
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
5fff57339f
Move config to core/js/config.php
2013-01-21 00:10:47 +01:00
d39655e126
Move template parameters around so database error page is properly rendered
2013-01-07 14:15:51 -05:00
0fa59f8937
use vector logo also on log in page, d'oh (also now retina-ready)
2012-12-06 16:29:56 +01:00
b51b9539d0
Very simple js console switcher.
2012-11-15 19:43:10 +01:00
7a7f12a0c1
Create only one CSRF token per session
...
Before, the CSRF token expired every hour. We had a script in place
which should refresh the token but this don't worked in every case.
(Laptop sleeping etc.)
With this commit, the token will only get once created for every
session so that the "Token expired" warning shouldn't appear.
2012-10-31 18:37:59 +01:00
5245e2b6be
->l expects two parameters
2012-10-28 10:33:18 +01:00
2d5edead77
Revert "Fix a typo"
...
This reverts commit a306e4b8a0
2012-10-28 10:21:06 +01:00
a306e4b8a0
Fix a typo
2012-10-28 10:19:31 +01:00
ec613b589b
Fix not defined JS variables
2012-10-25 17:51:59 +02:00
f493e97f5d
always generate access token, also for forms shown to anonymous users (e.g. public shares)
2012-10-05 10:32:38 +02:00
edcd297476
Move handling of core remotes to OC_TemplateLayout
2012-09-07 16:42:46 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
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
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
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
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
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +02:00
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
8d14c489eb
changed short description and styled unobtrusively
2011-09-28 17:14:37 +02:00
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
a47f22a275
clarified what we do
2011-09-04 16:38:45 +02:00
0db5c734bc
some header fixes
2011-08-19 22:53:07 +02:00
4a52886728
updated why we do this
2011-08-15 17:02:26 +02:00
b2768637d2
updated translations
2011-08-13 05:13:35 +02:00
44f3dfe771
added semantic meaning with header, nav and footer
2011-08-09 10:30:37 +02:00
c350301342
optimized CSS, fixed login header
2011-08-08 19:50:42 +02:00
1dc3cb67fa
more improved error reporting
2011-08-06 23:31:38 +02:00
4d11e920be
provide an option to add custom elements to the header of templates
2011-06-24 18:02:19 +02:00
91c37bbb76
moved core stuff to /core
2011-06-20 20:29:30 +02:00
Thomas Müller
Georg Ehrke
Lukas Reschke
Michael Gapczynski
Jan-Christoph Borchardt
Thomas Tanghus
Björn Schießle
Bart Visscher
Brice Maron
Jan-Christoph Borchardt
Jan-Christoph Borchardt
Bart Visscher
Frank Karlitschek
Robin Appelman
Jakob Sack