wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5262 commits 157 branches 562 tags 714 MiB
Commit graph

5262 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
2fd7df57d9 don't add the "Shared"-directory size to users quota 2012-06-18 15:35:22 +02:00
Georg Ehrke
beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" 
This reverts commit e3b58f6783.
 2012-06-18 14:47:58 +02:00
Georg Ehrke
e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function" 
This reverts commit aa7ce480f4.
 2012-06-18 14:47:09 +02:00
Georg Ehrke
6b6d3d68d4 Merge branch 'master' into calendar_repeat 2012-06-18 14:34:43 +02:00
Georg Ehrke
c2b7d05188 Merge branch 'master' into calendar_export 2012-06-18 14:34:38 +02:00
Florian Hülsmann
7064f3a8a8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-18 13:37:25 +02:00
Florian Hülsmann
4a50c15a8e corrected header width and floating (can now dynamically add stuff to header); someone may test this in IE 2012-06-18 13:36:49 +02:00
Bart Visscher
977cd0df6b Fix errors for minimizer 2012-06-18 11:33:24 +02:00
Bart Visscher
a5a1a9fd4a Forgot a file 2012-06-18 11:12:53 +02:00
Bart Visscher
617de811f7 Cache the minimized output also on the server 2012-06-18 11:11:46 +02:00
Bjoern Schiessle
91f69858e4 escape log messages to avoid possible js execution 2012-06-18 09:42:31 +02:00
Thomas Tanghus
e5feb4e1aa Remove obsolete js. 2012-06-18 02:22:22 +02:00
Thomas Tanghus
73fd4c979a Update js after contactlist change. 2012-06-18 02:21:29 +02:00
Thomas Tanghus
a4f53922c2 Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:36:25 +02:00
Thomas Tanghus
cab4a634df Save addressbook id to be able to rearrange contacts properly. 2012-06-17 23:14:02 +02:00
Thomas Tanghus
3efec3fde9 Make contact list fit in viewport. 2012-06-17 23:12:48 +02:00
Thomas Tanghus
ea4d8ccf70 Rearrange markup. 2012-06-17 23:12:11 +02:00
Thomas Tanghus
8337b30e43 Add thumbnail links so they are loaded when addressbook is expanded. 2012-06-17 23:09:25 +02:00
Thomas Tanghus
7d84c4741c Use uasort instead of usort. 2012-06-17 21:50:49 +02:00
Thomas Tanghus
46a771d2e6 Sort addressbooks. 2012-06-17 21:47:15 +02:00
Thomas Tanghus
fb700de4a4 Add effect on addressbook show/hide. 2012-06-17 21:37:13 +02:00
Thomas Tanghus
9e4a41e9cb Add effect on addressbook show/hide. 2012-06-17 21:34:56 +02:00
Thomas Tanghus
5a8f4b8783 Adjustments for inview handler etc. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
b6b6d69158 Moved parsing to the controller and js to contacts.js. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
2875901fc7 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
91f5a1de39 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus
b1cfc99f63 Styled address book entries. 2012-06-17 20:25:32 +02:00
Thomas Tanghus
56d25d4d1b Make the parsing in the controller, not in the template. Assign only relevant entries to the template. 2012-06-17 20:25:32 +02:00
Stephan Bergemann
92e35bd843 now a little less in template - more in ajax controller 2012-06-17 20:25:32 +02:00
Stephan Bergemann
7f485d1b20 contacts app now lists contacts sorted by expandable/collapsable addressbooks 2012-06-17 20:25:32 +02:00
Georg Ehrke
b8daae30b6 Merge branch 'master' into calendar_repeat 2012-06-17 16:41:49 +02:00
Georg Ehrke
4b872d10fc Merge branch 'master' into calendar_export 2012-06-17 16:41:44 +02:00
Tom Needham
b064fc6968 user_migrate: remove old code 2012-06-17 12:06:40 +00:00
Georg Ehrke
229587a31e Merge branch 'master' into calendar_repeat 2012-06-17 08:36:26 +02:00
Georg Ehrke
a8da950819 Merge branch 'master' into calendar_export 2012-06-17 08:36:20 +02:00
Robin Appelman
ad4f066bac suppress error when using is_dir on non directory in smb backend 2012-06-17 03:09:49 +02:00
Robin Appelman
ed66c63c29 improve caching smb results a bit 2012-06-17 02:59:38 +02:00
Robin Appelman
769cbe9a4c improve filecache support for smb 2012-06-17 02:54:23 +02:00
Robin Appelman
5b6229544d fix statcache for filenames containing non-alphanumeric characters in smb streamwrapper 2012-06-17 02:42:40 +02:00
Robin Appelman
549541215e get the correct metadate from updated folders to put in the cache 2012-06-17 02:15:11 +02:00
Michael Gapczynski
e8dd86ce0d Revert "Set default charset to utf-8." 
This reverts commit 709dbd82a6.
 2012-06-16 19:48:03 -04:00
Robin Appelman
b38e46276f when checking if the content of a folder has been updated, exlicitly state that we are checking a folder 
solves some issues with external storages not updating correctly
 2012-06-17 01:31:57 +02:00
Bart Visscher
6f93176a4b Be smarter when checking single app language availability 2012-06-16 20:52:10 +02:00
Bart Visscher
6e9cd63fa1 Only check for apps owncloud version requirment when there is a new owncloud version 2012-06-16 20:52:10 +02:00
Bart Visscher
99a68abbd5 Add session_write_close to the minimizer 2012-06-16 20:52:10 +02:00
Thomas Tanghus
9c6d82d00d PDF Viewer: Double encode link. 2012-06-16 19:48:33 +02:00
Georg Ehrke
7f1e0287a9 Merge branch 'master' into calendar_repeat 2012-06-16 19:04:50 +02:00
Georg Ehrke
56f8fc0f70 Merge branch 'master' into calendar_export 2012-06-16 19:04:45 +02:00
Thomas Tanghus
1118498050 files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:54:55 +02:00
Thomas Tanghus
4cbdd59859 Fix char encoding. 2012-06-16 18:38:20 +02:00